From f3d6e35fbcc44e66b57f308a67d12a3a389918ac Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 13 Jul 2015 17:32:07 -0700 Subject: [PATCH] Update Rust nightly Looks like the new LLVM version has optimizations which help out a good deal with the recursion faced in the resolver, so let's use that version instead! --- Cargo.lock | 54 +++++++++++++++++++++++-------- src/cargo/core/package_id_spec.rs | 1 + src/cargo/ops/cargo_package.rs | 1 + src/cargo/ops/cargo_test.rs | 1 + src/cargo/util/graph.rs | 2 +- src/registry/lib.rs | 1 + src/rustversion.txt | 2 +- tests/support/mod.rs | 1 + tests/support/registry.rs | 1 + 9 files changed, 48 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e4de70567..ca224ee04 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9,22 +9,22 @@ dependencies = [ "env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "filetime 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "git2 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "git2 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "git2-curl 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", "hamcrest 0.1.0 (git+https://github.com/carllerche/hamcrest-rust.git)", "kernel32-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "libgit2-sys 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", + "libgit2-sys 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "registry 0.1.0", "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", "tar 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "term 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", + "term 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", "threadpool 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", @@ -40,6 +40,14 @@ dependencies = [ "winapi 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "aho-corasick" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "memchr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "bitflags" version = "0.1.1" @@ -78,7 +86,7 @@ name = "docopt" version = "0.6.67" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "regex 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "strsim 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -89,7 +97,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -113,12 +121,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "git2" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "libgit2-sys 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", + "libgit2-sys 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -128,7 +136,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "curl 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "git2 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "git2 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -158,11 +166,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libgit2-sys" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "libssh2-sys 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", + "libssh2-sys 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -178,7 +186,7 @@ dependencies = [ [[package]] name = "libssh2-sys" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -209,6 +217,14 @@ name = "matches" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "memchr" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "miniz-sys" version = "0.1.5" @@ -260,7 +276,17 @@ dependencies = [ [[package]] name = "regex" -version = "0.1.30" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "aho-corasick 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "regex-syntax 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "regex-syntax" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -304,7 +330,7 @@ dependencies = [ [[package]] name = "term" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/src/cargo/core/package_id_spec.rs b/src/cargo/core/package_id_spec.rs index d69a461bc..a950e6006 100644 --- a/src/cargo/core/package_id_spec.rs +++ b/src/cargo/core/package_id_spec.rs @@ -131,6 +131,7 @@ fn url(s: &str) -> url::ParseResult { } impl fmt::Display for PackageIdSpec { + #[allow(deprecated)] // connect => join in 1.3 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { let mut printed_name = false; match self.url { diff --git a/src/cargo/ops/cargo_package.rs b/src/cargo/ops/cargo_package.rs index 88965c01b..7c6c04c1a 100644 --- a/src/cargo/ops/cargo_package.rs +++ b/src/cargo/ops/cargo_package.rs @@ -69,6 +69,7 @@ pub fn package(manifest_path: &Path, // check that the package has some piece of metadata that a human can // use to tell what the package is about. +#[allow(deprecated)] // connect => join in 1.3 fn check_metadata(pkg: &Package, config: &Config) -> CargoResult<()> { let md = pkg.manifest().metadata(); diff --git a/src/cargo/ops/cargo_test.rs b/src/cargo/ops/cargo_test.rs index a911058fb..9fe2f02a1 100644 --- a/src/cargo/ops/cargo_test.rs +++ b/src/cargo/ops/cargo_test.rs @@ -11,6 +11,7 @@ pub struct TestOptions<'a> { pub no_run: bool, } +#[allow(deprecated)] // connect => join in 1.3 pub fn run_tests(manifest_path: &Path, options: &TestOptions, test_args: &[String]) -> CargoResult> { diff --git a/src/cargo/util/graph.rs b/src/cargo/util/graph.rs index ad02a04b1..53a2b9c5a 100644 --- a/src/cargo/util/graph.rs +++ b/src/cargo/util/graph.rs @@ -25,7 +25,7 @@ impl Graph { } pub fn link(&mut self, node: N, child: N) { - self.nodes.entry(node).or_insert(HashSet::new()).insert(child); + self.nodes.entry(node).or_insert_with(|| HashSet::new()).insert(child); } pub fn get_nodes(&self) -> &HashMap> { diff --git a/src/registry/lib.rs b/src/registry/lib.rs index 331933bda..11787a29f 100644 --- a/src/registry/lib.rs +++ b/src/registry/lib.rs @@ -249,6 +249,7 @@ fn handle(response: result::Result) } impl fmt::Display for Error { + #[allow(deprecated)] // connect => join in 1.3 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match *self { Error::NonUtf8Body => write!(f, "response body was not utf-8"), diff --git a/src/rustversion.txt b/src/rustversion.txt index 298ea48f8..d9acb0125 100644 --- a/src/rustversion.txt +++ b/src/rustversion.txt @@ -1 +1 @@ -2015-06-13 +2015-07-13 diff --git a/tests/support/mod.rs b/tests/support/mod.rs index 24cda579f..d07ef5947 100644 --- a/tests/support/mod.rs +++ b/tests/support/mod.rs @@ -319,6 +319,7 @@ impl Execs { "stderr", &actual.stdout) } + #[allow(deprecated)] // connect => join in 1.3 fn match_std(&self, expected: Option<&String>, actual: &[u8], description: &str, extra: &[u8]) -> ham::MatchResult { match expected.map(|s| &s[..]) { diff --git a/tests/support/registry.rs b/tests/support/registry.rs index 4588bf1c6..583916fdb 100644 --- a/tests/support/registry.rs +++ b/tests/support/registry.rs @@ -117,6 +117,7 @@ pub fn publish(file: &str, line: &str) { &[&parent]).unwrap(); } +#[allow(deprecated)] // connect => join in 1.3 pub fn pkg(name: &str, vers: &str, deps: &[(&str, &str, &str)], cksum: &str, yanked: bool) -> String { let deps = deps.iter().map(|&(a, b, c)| dep(a, b, c)).collect::>(); -- 2.30.2